From 0cc916c5d73717fc357129c5b5c42d0c9072280f Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Wed, 31 Oct 2001 22:57:51 +0000 Subject: [PATCH] don't know why this didn't commit --- gtk/gtkcellrenderertext.c | 5 ++++- gtk/gtktreeviewcolumn.c | 4 +++- tests/testtreesort.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index dbebb89707..68784a2b16 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1272,7 +1272,10 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, } else { - state = GTK_STATE_NORMAL; + if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) + state = GTK_STATE_INSENSITIVE; + else + state = GTK_STATE_NORMAL; } if (celltext->background_set && state != GTK_STATE_SELECTED) diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 18a3363087..87c5dacf4a 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -695,7 +695,9 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) { GtkWidget *toplevel = gtk_widget_get_toplevel (tree_column->tree_view); if (GTK_WIDGET_TOPLEVEL (toplevel)) - gtk_window_set_focus (GTK_WINDOW (toplevel), NULL); + { + gtk_window_set_focus (GTK_WINDOW (toplevel), NULL); + } } } diff --git a/tests/testtreesort.c b/tests/testtreesort.c index fd504f6d7b..8cdcb116f6 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -93,6 +93,7 @@ main (int argc, char *argv[]) ssmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (smodel)); */ tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model)); + /* 12 iters now, 12 later... */ for (i = 0; data[i].word_1 != NULL; i++) { -- 2.30.2